From 9e421e5de6c84a632205e24dc293e4c5f8c49336 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 25 May 2012 13:31:18 +0300 Subject: [PATCH] Follow-up for revision 108101. lisp/cus-start.el : Avoid warning on platforms that don't link in fontset.c. --- lisp/ChangeLog | 5 +++++ lisp/cus-start.el | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c83db32cb9f..291496c26ba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-05-25 Eli Zaretskii + + * cus-start.el : Avoid warning on + platforms that don't link in fontset.c. + 2012-05-25 Juri Linkov Use the same diff color scheme as in modern VCSes (bug#10181). diff --git a/lisp/cus-start.el b/lisp/cus-start.el index fc3c6561a1e..3ea5f41db55 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -549,6 +549,10 @@ since it could result in memory overflow and make Emacs crash." ;; the condition for loadup.el to preload tool-bar.el. ((string-match "tool-bar-" (symbol-name symbol)) (fboundp 'x-create-frame)) + ((equal "vertical-centering-font-regexp" + (symbol-name symbol)) + ;; Any function from fontset.c will do. + (fboundp 'new-fontset)) (t t)))) (if (not (boundp symbol)) ;; If variables are removed from C code, give an error here! -- 2.30.2